From 82b2737960d06e9c9582c27ff8271deea4c3ab71 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 24 Nov 2021 18:07:16 +0100 Subject: [PATCH] Disable libtbb-dev build-dep on !linux. (Closes: #996257) --- debian/control | 4 ++-- debian/rules | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 3d4edee6b..fa8619c44 100644 --- a/debian/control +++ b/debian/control @@ -50,7 +50,7 @@ Build-Depends: chrpath, libproj-dev, libsqlite3-dev, libswscale-dev, - libtbb-dev, + libtbb-dev [linux-any], libtheora-dev, libtiff-dev, libutfcpp-dev, @@ -115,7 +115,7 @@ Depends: ${misc:Depends}, libproj-dev, libpython3-dev, libswscale-dev, - libtbb-dev, + libtbb-dev [linux-any], libtheora-dev, libtiff-dev, libutfcpp-dev, diff --git a/debian/rules b/debian/rules index 00aac34eb..1137897fb 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,13 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4)) export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed endif +notbb_archs=hurd-i386 kfreebsd-i386 kfreebsd-amd64 +ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(notbb_archs))) + extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB" +else + extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="OpenMP" +endif + %: dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python3 --with javahelper @@ -64,7 +71,6 @@ extra_flags += \ -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_utf8:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \ - -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB" \ -DVTK_PYTHON_VERSION:STRING=3 \ -DVTK_USE_TK=ON \ -DVTK_WRAP_PYTHON=ON \ -- 2.30.2